diff --git a/swh/web/ui/templates/includes/apidoc-header-toc.html b/swh/web/ui/templates/includes/apidoc-header-toc.html
index e3d81e2e..9890753f 100644
--- a/swh/web/ui/templates/includes/apidoc-header-toc.html
+++ b/swh/web/ui/templates/includes/apidoc-header-toc.html
@@ -1,8 +1,8 @@
<li><a href="{{ url_for('browse_api_doc') }}#endpoint-index">Endpoint index</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#data-model">Data Model</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#version">Version</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#schema">Schema</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#parameters">Parameters</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#errors">Errors</a></li>
- <li><a href="{{ url_for('browse_api_doc') }}#errors">Pagination</a></li>
- <li><a href="{{ url_for('browse_api_doc') }}#errors">Rate limiting</a></li>
+ <li><a href="{{ url_for('browse_api_doc') }}#pagination">Pagination</a></li>
+ <li><a href="{{ url_for('browse_api_doc') }}#rate-limiting">Rate limiting</a></li>
diff --git a/swh/web/ui/templates/includes/apidoc-header.html b/swh/web/ui/templates/includes/apidoc-header.html
index ba6213ff..a76d8064 100644
--- a/swh/web/ui/templates/includes/apidoc-header.html
+++ b/swh/web/ui/templates/includes/apidoc-header.html
@@ -1,104 +1,104 @@
<p>This document describes the <strong>Software Heritage Web API</strong>.</p>
<ul>
<li>
<a href="{{ url_for('browse_api_doc') }}#endpoint-index">Endpoint index</a>
</li>
<li>
<a href="{{ url_for('browse_api_doc') }}#data-model">Data model</a>
</li>
<li>
<a href="{{ url_for('browse_api_doc') }}#version">Version</a>
</li>
<li>
<a href="{{ url_for('browse_api_doc') }}#schema">Schema</a>
</li>
<li>
<a href="{{ url_for('browse_api_doc') }}#parameters">Parameters</a>
</li>
<li>
<a href="{{ url_for('browse_api_doc') }}#errors">Errors</a>
</li>
<li>
<a href="{{ url_for('browse_api_doc') }}#pagination">Pagination</a>
</li>
<li>
-<a href="{{ url_for('browse_api_doc') }}#errors">Rate limiting</a>
+<a href="{{ url_for('browse_api_doc') }}#rate-limiting">Rate limiting</a>
</li>
</ul>
<h3 id="endpoint-index">Endpoint index</h3>
<p>You can jump directly to the <strong><a href="/api/1/">endpoint index</a></strong>, which lists all available API functionalities, or read on for more general information about the API.</p>
<h3 id="data-model">Data model</h3>
<p>The <a href="https://www.softwareheritage.org/">Software Heritage</a> project harvests publicly available source code by tracking software distribution channels such as version control systems, tarball releases, and distribution packages.</p>
<p>All retrieved source code and related metadata are stored in the Software Heritage archive, that is conceptually a <a href="https://en.wikipedia.org/wiki/Merkle_tree">Merkle DAG</a>. All nodes in the graph are content-addressable, i.e., their node identifiers are computed by hashing their content and, transitively, that of all nodes reachable from them; and no node or edge is ever removed from the graph: the Software Heritage archive is an append-only data structure.</p>
<p>The following types of objects (i.e., graph nodes) can be found in the Software Heritage archive <small>(for more information see the <a href="https://wiki.softwareheritage.org/index.php?title=Glossary">Software Heritage glossary</a>)</small>:</p>
<ul>
<li><strong>Content</strong>: a specific version of a file stored in the archive, identified by its cryptographic hashes (currently: SHA1, Git-like "salted" SHA1, SHA256). Note that content objects are nameless; their names are context-dependent and stored as part of directory entries (see below).<br /> <em>Also known as:</em> "blob"</li>
<li><strong>Directory</strong>: a list of directory entries, where each entry can point to content objects ("file entries"), revisions ("revision entries"), or transitively to other directories ("directory entries"). All entries are associated to the local name of the entry (i.e., a relative path without any path separator) and permission metadata (e.g., chmod value or equivalent).</li>
<li><strong>Revision</strong>: a point in time snapshot of the content of a directory, together with associated development metadata (e.g., author, timestamp, log message, etc).<br /> <em>Also known as:</em> "commit".</li>
<li><strong>Release</strong>: a revision that has been marked as noteworthy with a specific name (e.g., a version number), together with associated development metadata (e.g., author, timestamp, etc).<br /> <em>Also known as:</em> "tag"</li>
<li><strong>Origin</strong>: an Internet-based location from which a coherent set of objects (contents, revisions, releases, etc.) archived by Software Heritage has been obtained. Origins are currently identified by URLs.</li>
<li><strong>Visit</strong>: the passage of Software Heritage on a given origin, to retrieve all source code and metadata available there at the time. A visit object stores the state of all visible branches (if any) available at the origin at visit time; each of them points to a revision object in the archive. Future visits of the same origin will create new visit objects, without removing previous ones.</li>
<li><strong>Person</strong>: an entity referenced by a revision as either the author or the committer of the corresponding change. A person is associated to a full name and/or an email address.</li>
</ul>
<h3 id="version">Version</h3>
<p>The current version of the API is <strong>v1</strong>.</p>
<h3 id="schema">Schema</h3>
<p>API access is over HTTPS.</p>
<p>All API endpoints are rooted at <a href="https://archive.softwareheritage.org/api/1/" class="uri">https://archive.softwareheritage.org/api/1/</a>.</p>
<p>Data is sent and received as JSON by default.</p>
<p>Example:</p>
<ul>
<li><p>from the command line:</p>
<pre class="shell"><code>curl -i https://archive.softwareheritage.org/api/1/stat/counters/</code></pre></li>
</ul>
<h4 id="response-format-override">Response format override</h4>
<p>The response format can be overridden using the <code>Accept</code> request header. In particular, <code>Accept: text/html</code> (that web browsers send by default) requests HTML pretty-printing, whereas <code>Accept: application/yaml</code> requests YAML-encoded responses.</p>
<p>Example:</p>
<ul>
<li><a href="/api/1/stat/counters/" class="uri">/api/1/stat/counters/</a></li>
<li><p>from the command line:</p>
<pre class="shell"><code>curl -i -H 'Accept: application/yaml' https://archive.softwareheritage.org/api/1/stat/counters/</code></pre></li>
</ul>
<h3 id="parameters">Parameters</h3>
<p>Some API endpoints can be tweaked by passing optional parameters. For GET requests, optional parameters can be passed as an HTTP query string.</p>
<p>The optional parameter <code>fields</code> is accepted by all endpoints that return dictionaries and can be used to restrict the list of fields returned by the API, in case you are not interested in all of them. By default, all available fields are returned.</p>
<p>Example:</p>
<ul>
<li><a href="/api/1/stat/counters/?fields=content,directory,revision" class="uri">/api/1/stat/counters/?fields=content,directory,revision</a></li>
<li><p>from the command line:</p>
<pre class="shell"><code>curl https://archive.softwareheritage.org/api/1/stat/counters/?fields=content,directory,revision</code></pre></li>
</ul>
<h3 id="errors">Errors</h3>
<p>While API endpoints will return different kinds of errors depending on their own semantics, some error patterns are common across all endpoints.</p>
<p>Sending malformed data, including syntactically incorrect object identifiers, will result in a <code>400 Bad Request</code> HTTP response. Example:</p>
<ul>
<li><a href="/api/1/content/deadbeef/" class="uri">/api/1/content/deadbeef/</a> (client error: "deadbeef" is too short to be a syntactically valid object identifier)</li>
<li><p>from the command line:</p>
<pre class="shell"><code>curl -i https://archive.softwareheritage.org/api/1/content/deadbeef/</code></pre></li>
</ul>
<p>Requesting non existent resources will result in a <code>404 Not Found</code> HTTP response. Example:</p>
<ul>
<li><a href="/api/1/content/0123456789abcdef0123456789abcdef01234567/" class="uri">/api/1/content/0123456789abcdef0123456789abcdef01234567/</a> (error: no object with that identifier is available [yet?])</li>
<li><p>from the command line:</p>
<pre class="shell"><code>curl -i https://archive.softwareheritage.org/api/1/content/04740277a81c5be6c16f6c9da488ca073b770d7f/</code></pre></li>
</ul>
<h3 id="pagination">Pagination</h3>
<p>Requests that might potentially return many items will be paginated.</p>
<p>Page size is set to a default (usually: 10 items), but might be overridden with the <code>per_page</code> query parameter up to a maximum (usually: 50 items). Example:</p>
<pre class="shell"><code>curl https://archive.softwareheritage.org/api/1/origin/1/visits/?per_page=2</code></pre>
<p>To navigate through paginated results, a <code>Link</code> HTTP response header is available to link the current result page to the next one. Example:</p>
<pre><code>curl -i https://archive.softwareheritage.org/api/1/origin/1/visits/?per_page=2 | grep ^Link:
Link: </api/1/origin/1/visits/?last_visit=2&per_page=2>; rel="next",</code></pre>
<h3 id="rate-limiting">Rate limiting</h3>
<p>Due to limited resource availability on the back end side, API usage is currently rate limited. Furthermore, as API usage is currently entirely anonymous (i.e., without any authentication), API "users" are currently identified by their origin IP address.</p>
<p>Three HTTP response fields will inform you about the current state of limits that apply to your current rate limiting bucket:</p>
<ul>
<li><code>X-RateLimit-Limit</code>: maximum number of permitted requests per hour</li>
<li><code>X-RateLimit-Remaining</code>: number of permitted requests remaining before the next reset</li>
<li><code>X-RateLimit-Reset</code>: the time (expressed in <a href="https://en.wikipedia.org/wiki/Unix_time">Unix time</a> seconds) at which the current rate limiting will expire, resetting to a fresh <code>X-RateLimit-Limit</code></li>
</ul>
<p>Example:</p>
<pre><code>curl -i https://archive.softwareheritage.org/api/1/stat/counters/ | grep ^X-RateLimit
X-RateLimit-Limit: 60
X-RateLimit-Remaining: 54
X-RateLimit-Reset: 1485794532</code></pre>
diff --git a/swh/web/ui/templates/includes/apidoc-header.md b/swh/web/ui/templates/includes/apidoc-header.md
index d744a1b6..c5e833d9 100644
--- a/swh/web/ui/templates/includes/apidoc-header.md
+++ b/swh/web/ui/templates/includes/apidoc-header.md
@@ -1,192 +1,192 @@
This document describes the <strong>Software Heritage Web API</strong>.
<ul>
<li><a href="{{ url_for('browse_api_doc') }}#endpoint-index">Endpoint index</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#data-model">Data model</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#version">Version</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#schema">Schema</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#parameters">Parameters</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#errors">Errors</a></li>
<li><a href="{{ url_for('browse_api_doc') }}#pagination">Pagination</a></li>
- <li><a href="{{ url_for('browse_api_doc') }}#errors">Rate limiting</a></li>
+ <li><a href="{{ url_for('browse_api_doc') }}#rate-limiting">Rate limiting</a></li>
</ul>
### Endpoint index
You can jump directly to the <strong><a href="/api/1/">endpoint
index</a></strong>, which lists all available API functionalities, or read on
for more general information about the API.
### Data model
The [Software Heritage](https://www.softwareheritage.org/) project harvests
publicly available source code by tracking software distribution channels such
as version control systems, tarball releases, and distribution packages.
All retrieved source code and related metadata are stored in the Software
Heritage archive, that is conceptually
a [Merkle DAG](https://en.wikipedia.org/wiki/Merkle_tree). All nodes in the
graph are content-addressable, i.e., their node identifiers are computed by
hashing their content and, transitively, that of all nodes reachable from them;
and no node or edge is ever removed from the graph: the Software Heritage
archive is an append-only data structure.
The following types of objects (i.e., graph nodes) can be found in the Software
Heritage archive <small>(for more information see
the
[Software Heritage glossary](https://wiki.softwareheritage.org/index.php?title=Glossary))</small>:
- **Content**: a specific version of a file stored in the archive, identified
by its cryptographic hashes (currently: SHA1, Git-like "salted" SHA1,
SHA256). Note that content objects are nameless; their names are
context-dependent and stored as part of directory entries (see below).<br />
*Also known as:* "blob"
- **Directory**: a list of directory entries, where each entry can point to
content objects ("file entries"), revisions ("revision entries"), or
transitively to other directories ("directory entries"). All entries are
associated to the local name of the entry (i.e., a relative path without any
path separator) and permission metadata (e.g., chmod value or equivalent).
- **Revision**: a point in time snapshot of the content of a directory,
together with associated development metadata (e.g., author, timestamp, log
message, etc).<br />
*Also known as:* "commit".
- **Release**: a revision that has been marked as noteworthy with a specific
name (e.g., a version number), together with associated development metadata
(e.g., author, timestamp, etc).<br />
*Also known as:* "tag"
- **Origin**: an Internet-based location from which a coherent set of objects
(contents, revisions, releases, etc.) archived by Software Heritage has been
obtained. Origins are currently identified by URLs.
- **Visit**: the passage of Software Heritage on a given origin, to retrieve
all source code and metadata available there at the time. A visit object
stores the state of all visible branches (if any) available at the origin at
visit time; each of them points to a revision object in the archive. Future
visits of the same origin will create new visit objects, without removing
previous ones.
- **Person**: an entity referenced by a revision as either the author or the
committer of the corresponding change. A person is associated to a full name
and/or an email address.
### Version
The current version of the API is **v1**.
### Schema
API access is over HTTPS.
All API endpoints are rooted at <https://archive.softwareheritage.org/api/1/>.
Data is sent and received as JSON by default.
Example:
- from the command line:
``` shell
curl -i https://archive.softwareheritage.org/api/1/stat/counters/
```
#### Response format override
The response format can be overridden using the `Accept` request header. In
particular, `Accept: text/html` (that web browsers send by default) requests
HTML pretty-printing, whereas `Accept: application/yaml` requests YAML-encoded
responses.
Example:
- [/api/1/stat/counters/](/api/1/stat/counters/)
- from the command line:
``` shell
curl -i -H 'Accept: application/yaml' https://archive.softwareheritage.org/api/1/stat/counters/
```
### Parameters
Some API endpoints can be tweaked by passing optional parameters. For GET
requests, optional parameters can be passed as an HTTP query string.
The optional parameter `fields` is accepted by all endpoints that return
dictionaries and can be used to restrict the list of fields returned by the
API, in case you are not interested in all of them. By default, all available
fields are returned.
Example:
- [/api/1/stat/counters/\?fields\=content,directory,revision](/api/1/stat/counters/?fields=content,directory,revision)
- from the command line:
``` shell
curl https://archive.softwareheritage.org/api/1/stat/counters/?fields=content,directory,revision
```
### Errors
While API endpoints will return different kinds of errors depending on their
own semantics, some error patterns are common across all endpoints.
Sending malformed data, including syntactically incorrect object identifiers,
will result in a `400 Bad Request` HTTP response. Example:
- [/api/1/content/deadbeef/](/api/1/content/deadbeef/) (client error:
"deadbeef" is too short to be a syntactically valid object identifier)
- from the command line:
``` shell
curl -i https://archive.softwareheritage.org/api/1/content/deadbeef/
```
Requesting non existent resources will result in a `404 Not Found` HTTP
response. Example:
- [/api/1/content/0123456789abcdef0123456789abcdef01234567/](/api/1/content/0123456789abcdef0123456789abcdef01234567/)
(error: no object with that identifier is available [yet?])
- from the command line:
``` shell
curl -i https://archive.softwareheritage.org/api/1/content/04740277a81c5be6c16f6c9da488ca073b770d7f/
```
### Pagination
Requests that might potentially return many items will be paginated.
Page size is set to a default (usually: 10 items), but might be overridden with
the `per_page` query parameter up to a maximum (usually: 50 items). Example:
``` shell
curl https://archive.softwareheritage.org/api/1/origin/1/visits/?per_page=2
```
To navigate through paginated results, a `Link` HTTP response header is
available to link the current result page to the next one. Example:
curl -i https://archive.softwareheritage.org/api/1/origin/1/visits/?per_page=2 | grep ^Link:
Link: </api/1/origin/1/visits/?last_visit=2&per_page=2>; rel="next",
### Rate limiting
Due to limited resource availability on the back end side, API usage is
currently rate limited. Furthermore, as API usage is currently entirely
anonymous (i.e., without any authentication), API "users" are currently
identified by their origin IP address.
Three HTTP response fields will inform you about the current state of limits
that apply to your current rate limiting bucket:
- `X-RateLimit-Limit`: maximum number of permitted requests per hour
- `X-RateLimit-Remaining`: number of permitted requests remaining before the
next reset
- `X-RateLimit-Reset`: the time (expressed
in [Unix time](https://en.wikipedia.org/wiki/Unix_time) seconds) at which the
current rate limiting will expire, resetting to a fresh `X-RateLimit-Limit`
Example:
curl -i https://archive.softwareheritage.org/api/1/stat/counters/ | grep ^X-RateLimit
X-RateLimit-Limit: 60
X-RateLimit-Remaining: 54
X-RateLimit-Reset: 1485794532
diff --git a/swh/web/ui/templates/layout.html b/swh/web/ui/templates/layout.html
index cba035c1..d5fbcf90 100644
--- a/swh/web/ui/templates/layout.html
+++ b/swh/web/ui/templates/layout.html
@@ -1,80 +1,64 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% block title %}{% endblock %}</title>
<!-- BEGIN: bootstrap -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" integrity="sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css" integrity="sha384-aUGj/X2zp5rLCbBxumKTCw2Z50WgIr1vs/PFN4praOTvYXWlVyh2UtNUU0KAUhAX" crossorigin="anonymous">
<link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap-responsive.min.css') }}">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script>
<!-- END: bootstrap -->
<link rel="stylesheet" href="{{ url_for('static', filename='css/pygment.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/jquery.dataTables.min.css') }}">
<script src="{{ url_for('static', filename='lib/jquery.dataTables.min.js') }}"></script>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}" />
<script>document.domain = "softwareheritage.org";</script>
</head>
<body>
<a id="top"></a>
<div class="jumbotron">
<nav class="navbar navbar-default" id="swh-navbar-collapse">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target="#swh-navbar-collapse" aria-expanded="false"> <!-- screen-reader -->
<span class="sr-only">Toggle navigation menu</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" style="padding:5px" href="{{ url_for('homepage') }}"> <!-- logo -->
<img alt="SWH Archive" src="{{ url_for('static', filename='img/swh-logo.png') }}" class="swh-logo" />
</a>
<a class="navbar-brand sitename" href="{{ url_for('homepage') }}">
<span class="first-word">Software</span> <span class="second-word">Heritage</span>
</a>
</div>
-
- <nav class="nav nav-horizontal">
- <div class="collapse navbar-collapse">
- <ul class="nav navbar-nav">
- <li role="separator" class="divider"></li>
- <li><a href="{{ url_for('browse_api_doc') }}" class="dropdown-toggle" data-toggle="dropdown"
- role="button" aria-haspopup="true" aria-expanded="false">API <span class="caret"></span></a>
- <ul class="dropdown-menu">
- {% include 'includes/apidoc-header-toc.html' %}
- </ul>
- </li>
- <li role="separator" class="divider"></li>
- <li><a href="{{ url_for('about') }}">About</a></li>
- </ul>
- </div>
- </nav>
</nav>
</div>
<div class="container">
<div class="container">
<h1>{{ self.title() }}</h1>
</div>
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<div class="container messages">
{% for category, message in messages %}
<div class="alert alert-{{ category }}" role="alert">{{ message }}</div>
{% endfor %}
</div>
{% endif %}
{% endwith %}
<div class="container content">
{% block content %}{% endblock %}
</div>
</div>
<div id="back-to-top">
<a href="#top"><img alt="back to top" src="{{ url_for('static', filename='img/arrow-up-small.png') }}" /></a>
</div>
</body>
</html>
diff --git a/swh/web/ui/views/main.py b/swh/web/ui/views/main.py
index 9faea6b2..6308883b 100644
--- a/swh/web/ui/views/main.py
+++ b/swh/web/ui/views/main.py
@@ -1,21 +1,21 @@
# Copyright (C) 2016 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information
import flask
from ..main import app
@app.route('/')
def homepage():
"""Home page
"""
return flask.redirect(flask.url_for('browse_api_doc'))
-@app.route('/about/')
-def about():
- return flask.render_template('about.html')
+# @app.route('/about/')
+# def about():
+# return flask.render_template('about.html')